Do not, in any circumstances, distribute gtk.immodules.

Thu Nov 16 16:11:39 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/Makefile.am (EXTRA_DIST): Do not, in any circumstances,
	distribute gtk.immodules.

	* gtk/Makefile.am (install-data-local): Don't install the
	gtk.immodules file created for the uninstalled modules;
	instead run gtk-query-immodules after install

diff --git a/ChangeLog b/ChangeLog
index 53a706eaeaf6f0885a2b276a2191c2469aa58d10..a7df80624e39cf2b2aaadf7c459e719f89b54b46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Nov 16 16:11:39 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/Makefile.am (EXTRA_DIST): Do not, in any circumstances,
+       distribute gtk.immodules.
+
+       * gtk/Makefile.am (install-data-local): Don't install the
+       gtk.immodules file created for the uninstalled modules;
+       instead run gtk-query-immodules after install
+
 Wed Nov 15 21:51:31 2000  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/Makefile.am (im_xim_la_LDFLAGS): Point

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 53a706eaeaf6f0885a2b276a2191c2469aa58d10..a7df80624e39cf2b2aaadf7c459e719f89b54b46 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Thu Nov 16 16:11:39 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/Makefile.am (EXTRA_DIST): Do not, in any circumstances,
+       distribute gtk.immodules.
+
+       * gtk/Makefile.am (install-data-local): Don't install the
+       gtk.immodules file created for the uninstalled modules;
+       instead run gtk-query-immodules after install
+
 Wed Nov 15 21:51:31 2000  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/Makefile.am (im_xim_la_LDFLAGS): Point

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 53a706eaeaf6f0885a2b276a2191c2469aa58d10..a7df80624e39cf2b2aaadf7c459e719f89b54b46 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Thu Nov 16 16:11:39 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/Makefile.am (EXTRA_DIST): Do not, in any circumstances,
+       distribute gtk.immodules.
+
+       * gtk/Makefile.am (install-data-local): Don't install the
+       gtk.immodules file created for the uninstalled modules;
+       instead run gtk-query-immodules after install
+
 Wed Nov 15 21:51:31 2000  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/Makefile.am (im_xim_la_LDFLAGS): Point

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 53a706eaeaf6f0885a2b276a2191c2469aa58d10..a7df80624e39cf2b2aaadf7c459e719f89b54b46 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Thu Nov 16 16:11:39 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/Makefile.am (EXTRA_DIST): Do not, in any circumstances,
+       distribute gtk.immodules.
+
+       * gtk/Makefile.am (install-data-local): Don't install the
+       gtk.immodules file created for the uninstalled modules;
+       instead run gtk-query-immodules after install
+
 Wed Nov 15 21:51:31 2000  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/Makefile.am (im_xim_la_LDFLAGS): Point

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 53a706eaeaf6f0885a2b276a2191c2469aa58d10..a7df80624e39cf2b2aaadf7c459e719f89b54b46 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Thu Nov 16 16:11:39 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/Makefile.am (EXTRA_DIST): Do not, in any circumstances,
+       distribute gtk.immodules.
+
+       * gtk/Makefile.am (install-data-local): Don't install the
+       gtk.immodules file created for the uninstalled modules;
+       instead run gtk-query-immodules after install
+
 Wed Nov 15 21:51:31 2000  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/Makefile.am (im_xim_la_LDFLAGS): Point

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 53a706eaeaf6f0885a2b276a2191c2469aa58d10..a7df80624e39cf2b2aaadf7c459e719f89b54b46 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Thu Nov 16 16:11:39 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/Makefile.am (EXTRA_DIST): Do not, in any circumstances,
+       distribute gtk.immodules.
+
+       * gtk/Makefile.am (install-data-local): Don't install the
+       gtk.immodules file created for the uninstalled modules;
+       instead run gtk-query-immodules after install
+
 Wed Nov 15 21:51:31 2000  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/Makefile.am (im_xim_la_LDFLAGS): Point

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 53a706eaeaf6f0885a2b276a2191c2469aa58d10..a7df80624e39cf2b2aaadf7c459e719f89b54b46 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Thu Nov 16 16:11:39 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/Makefile.am (EXTRA_DIST): Do not, in any circumstances,
+       distribute gtk.immodules.
+
+       * gtk/Makefile.am (install-data-local): Don't install the
+       gtk.immodules file created for the uninstalled modules;
+       instead run gtk-query-immodules after install
+
 Wed Nov 15 21:51:31 2000  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/Makefile.am (im_xim_la_LDFLAGS): Point

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 46580073b9346261ef0c265281b31451f022f4e3..83eac005722403dcacbab65f9cdb7bc3d557f55c 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -508,14 +508,12 @@ endif
 EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-nanox-1.3.la libgtk-linux-fb-1.3.la
 
 
-gtkconfdir = $(sysconfdir)/gtk-2.0
-gtkconf_DATA = gtk.immodules
-
 # We create a dummy theme for the default GTK+ theme
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0
        echo "# Empty gtkrc for default theme" > $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
-       $(mkinstalldirs) $(DESTDIR)$(gtkconfdir)
+       $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0
+       $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
 uninstall-local:
        rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
 
@@ -623,6 +621,7 @@ EXTRA_DIST += @STRIP_BEGIN@         \
        makefile.mingw.in       \
        makefile.msc            \
        makefile.msc.in         \
-       $(gtkconf_DATA)         \
 @STRIP_END@
 
+install-data-local:
+